Skip to content

fix(gen): apply x-ogen-name to external types (x-ogen-type) - #1697

Merged
ernado merged 1 commit into
ogen-go:mainfrom
oha-4:fix/x-ogen-name-external-type
Jun 19, 2026
Merged

ernado merged 1 commit into
ogen-go:mainfrom
oha-4:fix/x-ogen-name-external-type

Conversation

@oha-4

@oha-4 oha-4 commented Jun 18, 2026 •

Copy link
Copy Markdown
Contributor

Problem

A component schema combining x-ogen-type (external Go type mapping) and x-ogen-name (type name override) ignores x-ogen-name. The generated type is named after the component key instead of the override.

components:
  schemas:
    usdAmount:
      type: string
      x-ogen-type: github.com/me/money.Decimal
      x-ogen-name: USDAmount
  • Expected: type USDAmount money.Decimal
  • Actual: type UsdAmount money.Decimal (PascalCase of the key usdAmount; x-ogen-name ignored)

x-ogen-name works for plain (non-external) schemas — only external types were affected.

Cause

In schemaGen.generate2 (gen/schema_gen.go), the x-ogen-type branch builds the external type and returns early, before the name-override block below it is reached. So the name stays the component-key-derived one.

Fix

Move the name resolution above the x-ogen-type branch so it always applies. The intervening DefaultSet and UniqueItems checks do not depend on name, so behavior for all other schemas is unchanged.

A side effect: external types now also get the R prefix for digit-leading names (previously skipped via the early return) — this only turns a previously-invalid Go identifier into a valid one.

Tests

  • Added a component-schema case (x-ogen-type + x-ogen-name) to _testdata/positive/type_extension_name.yml. The schema key usdAmount PascalCases to UsdAmount, while x-ogen-name: USDAmount is the Go-idiomatic spelling; the test reuses an existing testdata external type to avoid adding a dependency.
  • Regenerated the golden package and added a regression test (TestTypeExtensionName_JSON/Component).
  • go generate ./... changes only the test_type_extension_name package; no other golden output is affected.

Before / after (generated)

// before — name derived from the "usdAmount" component key
type UsdAmount decimal.Decimal   // OptUsdAmount, NewOptUsdAmount, ...
// after — name from x-ogen-name
type USDAmount decimal.Decimal   // OptUSDAmount, NewOptUSDAmount, ...

🤖 Generated with Claude Code

A component schema combining x-ogen-type (external Go type mapping) and
x-ogen-name (type name override) ignored x-ogen-name: the generated type
used the component key (e.g. "usdAmount" -> UsdAmount) instead of the
override (USDAmount).

The x-ogen-type branch in schemaGen.generate2 builds the external type and
returns early, before the name override below it was reached. Move the name
resolution above that branch so it always applies; the intervening DefaultSet
and UniqueItems checks do not depend on name, so behavior for other schemas is
unchanged.

Add a component-schema case (x-ogen-type + x-ogen-name) to
_testdata/positive/type_extension_name.yml and a regression test, regenerate
the golden package.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@oha-4
oha-4 force-pushed the fix/x-ogen-name-external-type branch from 670180e to a70b518 Compare June 18, 2026 12:42
@ernado
ernado merged commit 7d7f7fa into ogen-go:main Jun 19, 2026
15 checks passed
@oha-4
oha-4 deleted the fix/x-ogen-name-external-type branch June 19, 2026 06:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants